Flutter 1.20.3 engine cherrypicks #20838
Conversation
|
This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to flutter-1.20-candidate.7. See the Release Process for information about how other branches get updated. Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick. |
flutter-dashboard
bot
changed the base branch from
flutter-1.20-candidate.7
to
master
christopherfujino
changed the base branch from
master
to
flutter-1.20-candidate.7
christopherfujino
changed the title
christopherfujino
requested review from
blasten and
jason-simmons
and removed request for
flar
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat. Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
…tformViewsController` so it can access `FlutterViewController` when its available (flutter#20708)
|
@jason-simmons & @dnfield I actually got a merge conflict trying to cherry-pick Ok, so I made an attempt to resolve the conflict. I picked up an early return in canvas.cc (if no image, it returns before drawing, line 295) from some other commit in between the stable branch point and the cherry pick, but that seems like the right thing to do. PTAL. |
christopherfujino
force-pushed
the
cherrypicks-flutter-1.20-candidate.7
branch
from
263d66d to
14864c3
Compare
christopherfujino
force-pushed
the
cherrypicks-flutter-1.20-candidate.7
branch
from
c0d4628 to
7757faa
Compare
|
@jason-simmons and @dnfield can you double-check my merge (that resolved a conflict) 14864c3#diff-36581c173eef0311bb48263255854c24, especially line 298? |
|
LGTM but needs a format. |
how do I do that? is it a specific line I can hand format? |
|
Sorry, it doesn't need a format, there's some failure about NNBD in the web UI code... Tried kicking the bot just in case but I'd ask about this on #hackers-nnbd |
There's an open issue for this one: flutter/flutter#63686 |
|
@cyanglaz can I get an LGTM for the webview cherrypick? |
|
I will land this, as everything is green except |
|
Post-submit, it is expected that Fuchsia will fail due to flutter/flutter#64975. Ultimately, we would like to skip that test on release branches. |
Description
Cherrypicks:
45f09403d897dcac63787071169be7cdc90cce7f1c13abaab120d8d2d4c07e5b5fc75100f56a89e2e09af86a26df0fc05ec727d72deb7ae9fc89f446lint.shto always exit 0) because it was enabled after the branch point https://flutter-review.googlesource.com/c/recipes/+/4561 (and presubmit still runs latest recipe LUCI try jobs for release branches should use correct builder/recipes flutter#53371).